* xfns.c (Fx_open_connection): If we have X11R5, use

	XrmSetDatabase to set the display's database.  In older versions,
	just store the value into x_current_display->db.
	* xterm.h (HAVE_X11R5): Define this where appropriate.

diff --git a/src/xterm.h b/src/xterm.h
index 54a495d7bb09c9e2dc07eda1a5940d85067e0101..05bae039844d27247624fa1ceb1afdf90e82ac2c 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -67,6 +67,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define HAVE_X11R4
 #endif
 
+#ifdef XlibSpecificationRelease
+#if XlibSpecificationRelease >= 5
+#define HAVE_X11R5
+#endif
+#endif
+
 #define PIX_TYPE unsigned long
 #define XDISPLAY x_current_display,
 #define XFlushQueue() XFlush(x_current_display)